Did some renaming and rearanging of files
Merge pull request #5 from littlemeg27/master

Did some changes to names