Restructure directories, Add scaffolding for preprocessors