Fixed some structural issues.
Moved some files.