Changed to a more suitable file tree