Add dirs scaffold
Finish setting up