redid folder hierarchy to be less flat