diff --git a/fonts/fontawesome-webfont.eot b/fonts/fontawesome-webfont.eot
deleted file mode 100644
index c7b00d2ba..000000000
Binary files a/fonts/fontawesome-webfont.eot and /dev/null differ
diff --git a/fonts/fontawesome-webfont.woff b/fonts/fontawesome-webfont.woff
deleted file mode 100644
index 6e7483cf6..000000000
Binary files a/fonts/fontawesome-webfont.woff and /dev/null differ
diff --git a/fonts/fontawesome-webfont.woff2 b/fonts/fontawesome-webfont.woff2
deleted file mode 100644
index 7eb74fd12..000000000
Binary files a/fonts/fontawesome-webfont.woff2 and /dev/null differ
diff --git a/controller/boardcontroller.php b/lib/Controller/BoardController.php
similarity index 100%
rename from controller/boardcontroller.php
rename to lib/Controller/BoardController.php
diff --git a/controller/cardcontroller.php b/lib/Controller/CardController.php
similarity index 100%
rename from controller/cardcontroller.php
rename to lib/Controller/CardController.php
diff --git a/controller/labelcontroller.php b/lib/Controller/LabelController.php
similarity index 100%
rename from controller/labelcontroller.php
rename to lib/Controller/LabelController.php
diff --git a/controller/pagecontroller.php b/lib/Controller/PageController.php
similarity index 100%
rename from controller/pagecontroller.php
rename to lib/Controller/PageController.php
diff --git a/controller/sharecontroller.php b/lib/Controller/ShareController.php
similarity index 100%
rename from controller/sharecontroller.php
rename to lib/Controller/ShareController.php
diff --git a/controller/stackcontroller.php b/lib/Controller/StackController.php
similarity index 100%
rename from controller/stackcontroller.php
rename to lib/Controller/StackController.php
diff --git a/controller/stylecontroller.php b/lib/Controller/StyleController.php
similarity index 100%
rename from controller/stylecontroller.php
rename to lib/Controller/StyleController.php
diff --git a/db/acl.php b/lib/Db/Acl.php
similarity index 100%
rename from db/acl.php
rename to lib/Db/Acl.php
diff --git a/db/aclmapper.php b/lib/Db/AclMapper.php
similarity index 100%
rename from db/aclmapper.php
rename to lib/Db/AclMapper.php
diff --git a/db/board.php b/lib/Db/Board.php
similarity index 100%
rename from db/board.php
rename to lib/Db/Board.php
diff --git a/db/boardmapper.php b/lib/Db/BoardMapper.php
similarity index 100%
rename from db/boardmapper.php
rename to lib/Db/BoardMapper.php
diff --git a/db/card.php b/lib/Db/Card.php
similarity index 100%
rename from db/card.php
rename to lib/Db/Card.php
diff --git a/db/cardmapper.php b/lib/Db/CardMapper.php
similarity index 100%
rename from db/cardmapper.php
rename to lib/Db/CardMapper.php
diff --git a/db/deckmapper.php b/lib/Db/DeckMapper.php
similarity index 100%
rename from db/deckmapper.php
rename to lib/Db/DeckMapper.php
diff --git a/db/entity.php b/lib/Db/Entity.php
similarity index 100%
rename from db/entity.php
rename to lib/Db/Entity.php
diff --git a/db/label.php b/lib/Db/Label.php
similarity index 100%
rename from db/label.php
rename to lib/Db/Label.php
diff --git a/db/labelmapper.php b/lib/Db/LabelMapper.php
similarity index 100%
rename from db/labelmapper.php
rename to lib/Db/LabelMapper.php
diff --git a/db/stack.php b/lib/Db/Stack.php
similarity index 100%
rename from db/stack.php
rename to lib/Db/Stack.php
diff --git a/db/stackmapper.php b/lib/Db/StackMapper.php
similarity index 100%
rename from db/stackmapper.php
rename to lib/Db/StackMapper.php
diff --git a/service/boardservice.php b/lib/Service/BoardService.php
similarity index 100%
rename from service/boardservice.php
rename to lib/Service/BoardService.php
diff --git a/service/cardarchivedexception.php b/lib/Service/CardArchivedException.php
similarity index 100%
rename from service/cardarchivedexception.php
rename to lib/Service/CardArchivedException.php
diff --git a/service/cardservice.php b/lib/Service/CardService.php
similarity index 100%
rename from service/cardservice.php
rename to lib/Service/CardService.php
diff --git a/service/labelservice.php b/lib/Service/LabelService.php
similarity index 100%
rename from service/labelservice.php
rename to lib/Service/LabelService.php
diff --git a/service/servicepermissionexception.php b/lib/Service/ServicePermissionException.php
similarity index 100%
rename from service/servicepermissionexception.php
rename to lib/Service/ServicePermissionException.php
diff --git a/service/stackservice.php b/lib/Service/StackService.php
similarity index 100%
rename from service/stackservice.php
rename to lib/Service/StackService.php