Updated project and moved some files around. Pre-commit to shared large repo