Restructure, under Play-2.1.1 framework