Refactor of architecture, welcome aboard GULP