shuffled file locations, worked on refactoring code base