Did some re-organization in the name of setting a better dev environment and cross-compilation