Refactor repository, add/rename subdirs