Adding all files correctly this time