FUL-81 - Restructure folder for composer / namespace