Scaffold + base models
Removed temp dir