Changed private variables to public
New file structure, doing layout stuff, etc
Changing stuff