reorganize repo to follow convention