Simplify package structure and split the *Support source