restructured packages

this project needs a lot of work.