redo checkin for developement and simulator folder with AriaJS codebase