cleanup and restructure dirs