Reorganized the project in separate folder