Separated the classes into different files

Organized everything in a nice way