Bugfix + restructuration