change structure of files and functions, DONE lang indefication