Reorganisation of files to prepare for the creation of a package.
Added deletions (see previous commit).