Moved class files into packages