Update 5.0

Even more clean up:
Code and Folder Structure