Reorganizing project structure
Removing unnecessary parts