Moved some proj specific code out of reusable code