Rearranging files for easier management
Further cleanup.  Added packages building
Further cleanup and header rearranging
Build fixes