Rename and organize modules
Change adapter infrastructure