Organize things better to fix installation.