Commit subproject commit
Moved functions around.