Yet another attempt

Trying to put everything into the main folder, instead of into a
sub-folder.