moved classes to framework for better asset loading