Major clean up. Add classes and better names for vars and folders