cleanup and restructure dirs

cleanup and restructure dirs