made folder structure more sane