[GENERAL] reorganize files
[GENERAL] add missing file