Added category classes
Move source files into Classes