update paths
reorganize repo