Fix ridiculous directory structure