Added solution and cleaned up packages
Tidy up XML