clean up abit of the file organization