Fixing some mirror issues

Reverted to old sources style.