Fixing directorys up and.. you know.