Folder restructuring to accomodate new Swift code base