folder structure and re factoring identity models