Fix directories & stuff