Changed the file tree a little bit