Restructured the repo, and some minor changes.