Update directory structure to enable builds with sbt
Fix tests for Grid and State
Fix deprecation warnings