Modified customer and added test class
Rearraged directories, deleted some file
Please don't get mad at me if somethings messed up :)