Made changes
Moved things around, renamed packages