Updated references, folders and variable/object names
Cleaned up commented code and .html page a little