Organized Current Build, Fixed Filepaths