Topic/cleanup

Added -Xlint to compilation, broke up package objects and some more cleanup.