Cleanup II - 10thJuly2014

Refactoring few side projects to a different workspace