cleanup, create module structure