change base entity name and move it to base folder