Reorganised packages. Fixed a few comments & got rid of compile warnings