reorganize some file structures