Now the server starts with the new structure
Everything is working good now, can merge with master