restructure directory, add map