refactored class

moved classes