Reorganized classes into packages and organized includes.