WIP refactor
WIP refactor to have adapted source tree