Restructure project and add some entity classes