Moved Servlets to the servlets package & updated their mappings