moving stuff into packages to clean up project