restructured
i guess it works
fixed deps, and therefore the rest