fixed paths from directory restructure