Updated the structure of files to match the 0.3.0 file organisation.