Reorganizing files (see issue #1)