diff --git a/src/Jobs/Abstraction/AbstractJob.php b/src/Api/AbstractJob.php
similarity index 100%
rename from src/Jobs/Abstraction/AbstractJob.php
rename to src/Api/AbstractJob.php
diff --git a/src/Jobs/Abstraction/AbstractPostEditJob.php b/src/Api/AbstractPostJob.php
similarity index 74%
rename from src/Jobs/Abstraction/AbstractPostEditJob.php
rename to src/Api/AbstractPostJob.php
index 6764bc57..d886a103 100644
--- a/src/Jobs/Abstraction/AbstractPostEditJob.php
+++ b/src/Api/AbstractPostJob.php
@@ -1,5 +1,5 @@
 <?php
-abstract class AbstractPostEditJob extends AbstractJob
+abstract class AbstractPostJob extends AbstractJob
 {
 	protected $post;
 
diff --git a/src/Api.php b/src/Api/Api.php
similarity index 100%
rename from src/Api.php
rename to src/Api/Api.php
diff --git a/src/ApiFileInput.php b/src/Api/ApiFileInput.php
similarity index 100%
rename from src/ApiFileInput.php
rename to src/Api/ApiFileInput.php
diff --git a/src/ApiFileOutput.php b/src/Api/ApiFileOutput.php
similarity index 100%
rename from src/ApiFileOutput.php
rename to src/Api/ApiFileOutput.php
diff --git a/src/ApiMissingArgumentException.php b/src/Api/ApiMissingArgumentException.php
similarity index 100%
rename from src/ApiMissingArgumentException.php
rename to src/Api/ApiMissingArgumentException.php
diff --git a/src/Jobs/AddCommentJob.php b/src/Api/Jobs/AddCommentJob.php
similarity index 100%
rename from src/Jobs/AddCommentJob.php
rename to src/Api/Jobs/AddCommentJob.php
diff --git a/src/Jobs/AddPostJob.php b/src/Api/Jobs/AddPostJob.php
similarity index 100%
rename from src/Jobs/AddPostJob.php
rename to src/Api/Jobs/AddPostJob.php
diff --git a/src/Jobs/DeleteCommentJob.php b/src/Api/Jobs/DeleteCommentJob.php
similarity index 100%
rename from src/Jobs/DeleteCommentJob.php
rename to src/Api/Jobs/DeleteCommentJob.php
diff --git a/src/Jobs/DeletePostJob.php b/src/Api/Jobs/DeletePostJob.php
similarity index 92%
rename from src/Jobs/DeletePostJob.php
rename to src/Api/Jobs/DeletePostJob.php
index fc88d55c..0271e3ef 100644
--- a/src/Jobs/DeletePostJob.php
+++ b/src/Api/Jobs/DeletePostJob.php
@@ -1,5 +1,5 @@
 <?php
-class DeletePostJob extends AbstractPostEditJob
+class DeletePostJob extends AbstractPostJob
 {
 	public function execute()
 	{
diff --git a/src/Jobs/EditCommentJob.php b/src/Api/Jobs/EditCommentJob.php
similarity index 100%
rename from src/Jobs/EditCommentJob.php
rename to src/Api/Jobs/EditCommentJob.php
diff --git a/src/Jobs/EditPostContentJob.php b/src/Api/Jobs/EditPostContentJob.php
similarity index 92%
rename from src/Jobs/EditPostContentJob.php
rename to src/Api/Jobs/EditPostContentJob.php
index 277f8105..b90badcb 100644
--- a/src/Jobs/EditPostContentJob.php
+++ b/src/Api/Jobs/EditPostContentJob.php
@@ -1,5 +1,5 @@
 <?php
-class EditPostContentJob extends AbstractPostEditJob
+class EditPostContentJob extends AbstractPostJob
 {
 	const POST_CONTENT = 'post-content';
 
diff --git a/src/Jobs/EditPostJob.php b/src/Api/Jobs/EditPostJob.php
similarity index 93%
rename from src/Jobs/EditPostJob.php
rename to src/Api/Jobs/EditPostJob.php
index 813fe750..dfbd4988 100644
--- a/src/Jobs/EditPostJob.php
+++ b/src/Api/Jobs/EditPostJob.php
@@ -1,5 +1,5 @@
 <?php
-class EditPostJob extends AbstractPostEditJob
+class EditPostJob extends AbstractPostJob
 {
 	public function execute()
 	{
diff --git a/src/Jobs/EditPostRelationsJob.php b/src/Api/Jobs/EditPostRelationsJob.php
similarity index 96%
rename from src/Jobs/EditPostRelationsJob.php
rename to src/Api/Jobs/EditPostRelationsJob.php
index 055d53dd..6b85fd61 100644
--- a/src/Jobs/EditPostRelationsJob.php
+++ b/src/Api/Jobs/EditPostRelationsJob.php
@@ -1,5 +1,5 @@
 <?php
-class EditPostRelationsJob extends AbstractPostEditJob
+class EditPostRelationsJob extends AbstractPostJob
 {
 	const RELATED_POST_IDS = 'related-post-ids';
 
diff --git a/src/Jobs/EditPostSafetyJob.php b/src/Api/Jobs/EditPostSafetyJob.php
similarity index 93%
rename from src/Jobs/EditPostSafetyJob.php
rename to src/Api/Jobs/EditPostSafetyJob.php
index 77621fe4..5c5ece0f 100644
--- a/src/Jobs/EditPostSafetyJob.php
+++ b/src/Api/Jobs/EditPostSafetyJob.php
@@ -1,5 +1,5 @@
 <?php
-class EditPostSafetyJob extends AbstractPostEditJob
+class EditPostSafetyJob extends AbstractPostJob
 {
 	const SAFETY = 'safety';
 
diff --git a/src/Jobs/EditPostSourceJob.php b/src/Api/Jobs/EditPostSourceJob.php
similarity index 93%
rename from src/Jobs/EditPostSourceJob.php
rename to src/Api/Jobs/EditPostSourceJob.php
index a2f5b6bc..fe5d7990 100644
--- a/src/Jobs/EditPostSourceJob.php
+++ b/src/Api/Jobs/EditPostSourceJob.php
@@ -1,5 +1,5 @@
 <?php
-class EditPostSourceJob extends AbstractPostEditJob
+class EditPostSourceJob extends AbstractPostJob
 {
 	const SOURCE = 'source';
 
diff --git a/src/Jobs/EditPostTagsJob.php b/src/Api/Jobs/EditPostTagsJob.php
similarity index 95%
rename from src/Jobs/EditPostTagsJob.php
rename to src/Api/Jobs/EditPostTagsJob.php
index a0c65aad..9d8f8471 100644
--- a/src/Jobs/EditPostTagsJob.php
+++ b/src/Api/Jobs/EditPostTagsJob.php
@@ -1,5 +1,5 @@
 <?php
-class EditPostTagsJob extends AbstractPostEditJob
+class EditPostTagsJob extends AbstractPostJob
 {
 	public function execute()
 	{
diff --git a/src/Jobs/EditPostThumbJob.php b/src/Api/Jobs/EditPostThumbJob.php
similarity index 93%
rename from src/Jobs/EditPostThumbJob.php
rename to src/Api/Jobs/EditPostThumbJob.php
index 77027bdc..56c70dde 100644
--- a/src/Jobs/EditPostThumbJob.php
+++ b/src/Api/Jobs/EditPostThumbJob.php
@@ -1,5 +1,5 @@
 <?php
-class EditPostThumbJob extends AbstractPostEditJob
+class EditPostThumbJob extends AbstractPostJob
 {
 	const THUMB_CONTENT = 'thumb-content';
 
diff --git a/src/Jobs/EditPostUrlJob.php b/src/Api/Jobs/EditPostUrlJob.php
similarity index 93%
rename from src/Jobs/EditPostUrlJob.php
rename to src/Api/Jobs/EditPostUrlJob.php
index e5e14b2e..8c216410 100644
--- a/src/Jobs/EditPostUrlJob.php
+++ b/src/Api/Jobs/EditPostUrlJob.php
@@ -1,5 +1,5 @@
 <?php
-class EditPostUrlJob extends AbstractPostEditJob
+class EditPostUrlJob extends AbstractPostJob
 {
 	const POST_CONTENT_URL = 'post-content-url';
 
diff --git a/src/Jobs/FeaturePostJob.php b/src/Api/Jobs/FeaturePostJob.php
similarity index 93%
rename from src/Jobs/FeaturePostJob.php
rename to src/Api/Jobs/FeaturePostJob.php
index e40a8187..422c27a3 100644
--- a/src/Jobs/FeaturePostJob.php
+++ b/src/Api/Jobs/FeaturePostJob.php
@@ -1,5 +1,5 @@
 <?php
-class FeaturePostJob extends AbstractPostEditJob
+class FeaturePostJob extends AbstractPostJob
 {
 	public function execute()
 	{
diff --git a/src/Jobs/FlagPostJob.php b/src/Api/Jobs/FlagPostJob.php
similarity index 94%
rename from src/Jobs/FlagPostJob.php
rename to src/Api/Jobs/FlagPostJob.php
index 801a4292..98c85f6b 100644
--- a/src/Jobs/FlagPostJob.php
+++ b/src/Api/Jobs/FlagPostJob.php
@@ -1,5 +1,5 @@
 <?php
-class FlagPostJob extends AbstractPostEditJob
+class FlagPostJob extends AbstractPostJob
 {
 	public function execute()
 	{
diff --git a/src/Jobs/GetLogJob.php b/src/Api/Jobs/GetLogJob.php
similarity index 100%
rename from src/Jobs/GetLogJob.php
rename to src/Api/Jobs/GetLogJob.php
diff --git a/src/Jobs/GetPostContentJob.php b/src/Api/Jobs/GetPostContentJob.php
similarity index 100%
rename from src/Jobs/GetPostContentJob.php
rename to src/Api/Jobs/GetPostContentJob.php
diff --git a/src/Jobs/GetPostJob.php b/src/Api/Jobs/GetPostJob.php
similarity index 93%
rename from src/Jobs/GetPostJob.php
rename to src/Api/Jobs/GetPostJob.php
index cd0c945e..0479230c 100644
--- a/src/Jobs/GetPostJob.php
+++ b/src/Api/Jobs/GetPostJob.php
@@ -1,5 +1,5 @@
 <?php
-class GetPostJob extends AbstractPostEditJob
+class GetPostJob extends AbstractPostJob
 {
 	public function execute()
 	{
diff --git a/src/Jobs/GetPostThumbJob.php b/src/Api/Jobs/GetPostThumbJob.php
similarity index 100%
rename from src/Jobs/GetPostThumbJob.php
rename to src/Api/Jobs/GetPostThumbJob.php
diff --git a/src/Jobs/ListCommentsJob.php b/src/Api/Jobs/ListCommentsJob.php
similarity index 100%
rename from src/Jobs/ListCommentsJob.php
rename to src/Api/Jobs/ListCommentsJob.php
diff --git a/src/Jobs/ListLogsJob.php b/src/Api/Jobs/ListLogsJob.php
similarity index 100%
rename from src/Jobs/ListLogsJob.php
rename to src/Api/Jobs/ListLogsJob.php
diff --git a/src/Jobs/ListPostsJob.php b/src/Api/Jobs/ListPostsJob.php
similarity index 100%
rename from src/Jobs/ListPostsJob.php
rename to src/Api/Jobs/ListPostsJob.php
diff --git a/src/Jobs/PreviewCommentJob.php b/src/Api/Jobs/PreviewCommentJob.php
similarity index 100%
rename from src/Jobs/PreviewCommentJob.php
rename to src/Api/Jobs/PreviewCommentJob.php
diff --git a/src/Jobs/ScorePostJob.php b/src/Api/Jobs/ScorePostJob.php
similarity index 91%
rename from src/Jobs/ScorePostJob.php
rename to src/Api/Jobs/ScorePostJob.php
index 5e8c4211..e90cf8ce 100644
--- a/src/Jobs/ScorePostJob.php
+++ b/src/Api/Jobs/ScorePostJob.php
@@ -1,5 +1,5 @@
 <?php
-class ScorePostJob extends AbstractPostEditJob
+class ScorePostJob extends AbstractPostJob
 {
 	const SCORE = 'score';
 
diff --git a/src/Jobs/TogglePostFavoriteJob.php b/src/Api/Jobs/TogglePostFavoriteJob.php
similarity index 92%
rename from src/Jobs/TogglePostFavoriteJob.php
rename to src/Api/Jobs/TogglePostFavoriteJob.php
index 92b8505b..4f6daea9 100644
--- a/src/Jobs/TogglePostFavoriteJob.php
+++ b/src/Api/Jobs/TogglePostFavoriteJob.php
@@ -1,5 +1,5 @@
 <?php
-class TogglePostFavoriteJob extends AbstractPostEditJob
+class TogglePostFavoriteJob extends AbstractPostJob
 {
 	public function execute()
 	{
diff --git a/src/Jobs/TogglePostTagJob.php b/src/Api/Jobs/TogglePostTagJob.php
similarity index 96%
rename from src/Jobs/TogglePostTagJob.php
rename to src/Api/Jobs/TogglePostTagJob.php
index fbffc8c8..5dcf4f68 100644
--- a/src/Jobs/TogglePostTagJob.php
+++ b/src/Api/Jobs/TogglePostTagJob.php
@@ -1,5 +1,5 @@
 <?php
-class TogglePostTagJob extends AbstractPostEditJob
+class TogglePostTagJob extends AbstractPostJob
 {
 	public function execute()
 	{
diff --git a/src/Jobs/TogglePostVisibilityJob.php b/src/Api/Jobs/TogglePostVisibilityJob.php
similarity index 91%
rename from src/Jobs/TogglePostVisibilityJob.php
rename to src/Api/Jobs/TogglePostVisibilityJob.php
index 3ada9958..bbf682cb 100644
--- a/src/Jobs/TogglePostVisibilityJob.php
+++ b/src/Api/Jobs/TogglePostVisibilityJob.php
@@ -1,5 +1,5 @@
 <?php
-class TogglePostVisibilityJob extends AbstractPostEditJob
+class TogglePostVisibilityJob extends AbstractPostJob
 {
 	public function execute()
 	{