Update 4.9

More Cleanup: Code and Folder Structure