restructure repo with better naming