Organized packages

some of them probably still need to be moved. Also I don't know how to
nest packages