restructure the files
edit global variables