Started restructuring for new setup.