Restructured the project and it's now packaged by layer
Removed some leftovers from the restructering