Restructure step 1: moved async & common files into new directory structure