Fixed folder stuff we should get better commit messages