Rearranging files and working on problem 4