Finish cleanup - fix paths and remove duplicates (stupid git!)