Move the src files to match the repo structure