folder restructuring and reworked functionality (wip)