clean up and change package name to twc