Changed file tree, adjusted positioning