Moving files around and tweaking dependencies