Folder restructure. A few new problems added.