Simplified some packages.
Renamed classes/packages in RI for more clarity.
Moved some artifacts due to same reason.