restruct of packages and plus ConcurrentPromes Koan