Reorganization, better usage of Marionette modules