Organize new files before #57 commit