diff --git a/library/InvalidSignatureException.php b/exceptions/InvalidSignatureException.php
similarity index 100%
rename from library/InvalidSignatureException.php
rename to exceptions/InvalidSignatureException.php
diff --git a/library/TokenExpiredException.php b/exceptions/TokenExpiredException.php
similarity index 100%
rename from library/TokenExpiredException.php
rename to exceptions/TokenExpiredException.php
diff --git a/library/ErrorHandler.php b/handlers/ErrorHandler.php
similarity index 100%
rename from library/ErrorHandler.php
rename to handlers/ErrorHandler.php
diff --git a/library/interfaces/EndpointInterface.php b/interfaces/EndpointInterface.php
similarity index 100%
rename from library/interfaces/EndpointInterface.php
rename to interfaces/EndpointInterface.php
diff --git a/library/Authentication.php b/library/auth/Authentication.php
similarity index 100%
rename from library/Authentication.php
rename to library/auth/Authentication.php
diff --git a/library/JWTCodec.php b/library/auth/JWTCodec.php
similarity index 100%
rename from library/JWTCodec.php
rename to library/auth/JWTCodec.php
diff --git a/library/RefreshTokenGateway.php b/library/auth/RefreshTokenGateway.php
similarity index 100%
rename from library/RefreshTokenGateway.php
rename to library/auth/RefreshTokenGateway.php
diff --git a/library/UserGateway.php b/library/auth/UserGateway.php
similarity index 100%
rename from library/UserGateway.php
rename to library/auth/UserGateway.php
diff --git a/library/Ldap.php b/library/ldap/Ldap.php
similarity index 100%
rename from library/Ldap.php
rename to library/ldap/Ldap.php
diff --git a/library/TaskController.php b/library/tasks/TaskController.php
similarity index 100%
rename from library/TaskController.php
rename to library/tasks/TaskController.php
diff --git a/library/TaskGateway.php b/library/tasks/TaskGateway.php
similarity index 100%
rename from library/TaskGateway.php
rename to library/tasks/TaskGateway.php
diff --git a/library/plugins/MailUtils.php b/plugins/tasks/utils/MailUtils.php
similarity index 100%
rename from library/plugins/MailUtils.php
rename to plugins/tasks/utils/MailUtils.php
diff --git a/library/plugins/ReminderTokenUtils.php b/plugins/tasks/utils/ReminderTokenUtils.php
similarity index 100%
rename from library/plugins/ReminderTokenUtils.php
rename to plugins/tasks/utils/ReminderTokenUtils.php
diff --git a/library/plugins/Utils.php b/plugins/tasks/utils/Utils.php
similarity index 100%
rename from library/plugins/Utils.php
rename to plugins/tasks/utils/Utils.php