restructurization of code, make al lot of files