Various changes before merging
Added instructions on what needs to change for a different directory structure.