remove trailing spaces
make folders

point, state2, status -> type/
maybe, debug, union -> lib/