Made things work, by changing up the system directory and fixing namespaces
Removed old files from server.