moving classes

Will move classes to seperate file to make the code easier to read