Fixed some server errors. New project structure