moved almost everything to the new project structure