- Heavy code reorganization - Act 1 (We have to put some order)