jdk6/groovy1.8 compatibility
minor cleanup
equals added
views folder is unnecessary