reorganize files, separate keywords, variables and test cases