Start moving classes to its own files