Getting rid of submodules… it's too confusing :)