Rearrange package structure, remove non-metaprogramming stuff.