Fixed directory structure ya'll