Move some classes to new files