Subproject

These are the changes needed so far for compilation using subprojects