Better project structure (only moved some files)