Make scaffold
Remove unused files