Initial Commit for Implementing remove group, code organization.