Remove common module
Add Common folder after removing cache