Moving directories around
Moving more directories around in preparation for a multi-level gradle project