Renaming, and rearranging project into separate packages
merging restructure