Restructured package and added a thread safe map