Cleanup and added setup.
Move files, renamed package, and setup fixes.
Removed xml
Added changes and moved thigns around