Reorganized Source Files

Reorganized the project structure