Restructured into sub-dirs and removed ScopeSync