moved to package folder structure
Turn code into actual packages