move base classes to base folder