Relocated the entites and added base login functionality with filters