Move some classes to dedicated files