Modularized

I modularized all the classes into their respective modules