Move some classes to components folder