Merge "Create correct directory layout for swift on purpose."