Cleanup and Arrangements

+ Updated Copyrights
+ Updated Name
+ Some code arrangements
+ Renamed packages