Bunch of changes, renamed several files, reorganized the directories.