Restructuring project and updating scripts to reflect this