Reorganizing into seperate files