Moved common state attributes into a separate class
Removed extra getters/setter from state classes
Updated copyrights
Mass organize imports