misc: restructure dirs