Directory structure problems

Some files were note deleted before in the commits. Removed them in this
commit.