Reorganisation

Core almost achieved