redo dir structure - but i probably broke some things