Reorganization

A cleaner organisation