Changes to file location + further initial code commits