Moved classes to an appropriate package