restructure directory slightly