fixed filepaths and imports