fixed filepaths and moved some stuff around