Improve organization of files