Refresh SDK package, Organize into subdirectories