Fixed namespaces
Added src folder to server for real this time