Moved some class in separate files