Reorganizing files and modifying scope of this project