additional cleanup with package structure