Add in actual code source folders, were removed in last commit due to renaming of folder structures.