rearrange for proper naming/directory structure