diff --git a/parakeet/src/entities/post_converter.rs b/parakeet/src/entities/converters/post.rs
similarity index 100%
rename from parakeet/src/entities/post_converter.rs
rename to parakeet/src/entities/converters/post.rs
diff --git a/parakeet/src/entities/profile_converter.rs b/parakeet/src/entities/converters/profile.rs
similarity index 100%
rename from parakeet/src/entities/profile_converter.rs
rename to parakeet/src/entities/converters/profile.rs
diff --git a/parakeet/src/entities/feedgen.rs b/parakeet/src/entities/core/feedgen.rs
similarity index 100%
rename from parakeet/src/entities/feedgen.rs
rename to parakeet/src/entities/core/feedgen.rs
diff --git a/parakeet/src/entities/list.rs b/parakeet/src/entities/core/list.rs
similarity index 100%
rename from parakeet/src/entities/list.rs
rename to parakeet/src/entities/core/list.rs
diff --git a/parakeet/src/entities/notification.rs b/parakeet/src/entities/core/notification.rs
similarity index 100%
rename from parakeet/src/entities/notification.rs
rename to parakeet/src/entities/core/notification.rs
diff --git a/parakeet/src/entities/post.rs b/parakeet/src/entities/core/post.rs
similarity index 100%
rename from parakeet/src/entities/post.rs
rename to parakeet/src/entities/core/post.rs
diff --git a/parakeet/src/entities/profile.rs b/parakeet/src/entities/core/profile.rs
similarity index 100%
rename from parakeet/src/entities/profile.rs
rename to parakeet/src/entities/core/profile.rs
diff --git a/parakeet/src/entities/starterpack.rs b/parakeet/src/entities/core/starterpack.rs
similarity index 100%
rename from parakeet/src/entities/starterpack.rs
rename to parakeet/src/entities/core/starterpack.rs
diff --git a/parakeet/src/entities/actor_ext.rs b/parakeet/src/entities/ext/actor.rs
similarity index 100%
rename from parakeet/src/entities/actor_ext.rs
rename to parakeet/src/entities/ext/actor.rs
diff --git a/parakeet/src/entities/post_ext.rs b/parakeet/src/entities/ext/post.rs
similarity index 100%
rename from parakeet/src/entities/post_ext.rs
rename to parakeet/src/entities/ext/post.rs
diff --git a/parakeet/src/entities/feedgen_tests.rs b/parakeet/src/entities/tests/feedgen.rs
similarity index 100%
rename from parakeet/src/entities/feedgen_tests.rs
rename to parakeet/src/entities/tests/feedgen.rs
diff --git a/parakeet/src/entities/list_tests.rs b/parakeet/src/entities/tests/list.rs
similarity index 100%
rename from parakeet/src/entities/list_tests.rs
rename to parakeet/src/entities/tests/list.rs
diff --git a/parakeet/src/entities/notification_tests.rs b/parakeet/src/entities/tests/notification.rs
similarity index 100%
rename from parakeet/src/entities/notification_tests.rs
rename to parakeet/src/entities/tests/notification.rs
diff --git a/parakeet/src/entities/post_tests.rs b/parakeet/src/entities/tests/post.rs
similarity index 100%
rename from parakeet/src/entities/post_tests.rs
rename to parakeet/src/entities/tests/post.rs
diff --git a/parakeet/src/entities/profile_tests.rs b/parakeet/src/entities/tests/profile.rs
similarity index 100%
rename from parakeet/src/entities/profile_tests.rs
rename to parakeet/src/entities/tests/profile.rs
diff --git a/parakeet/src/entities/starterpack_tests.rs b/parakeet/src/entities/tests/starterpack.rs
similarity index 100%
rename from parakeet/src/entities/starterpack_tests.rs
rename to parakeet/src/entities/tests/starterpack.rs