Richard's Build File
More file structure fixing