restructure directory layout