Cleanup - 10thJuly2014

Refactoring few packages to a different project