Initial commit of entities and new config