Moved classes to package folder