Cleanup module/package structure