Moving stuff into src.