Reorganized the source location and started creating the entity