Incremental Fix

Package and Build update, Project Directory rearrange, Other Code
changes