Restructuring

Restructed the file system of the application