Restructured the files (see #22)