New changes. Mostly work on reorganizing package directories and tidying up code.: