Fixes to config and Rakefiles

To make compatible with repo in github organisation