[EDIT] Renamed package.
[ADD]Defined Views
[MERGE] Done merge