Added orbit js data management, and restuctured things