Change directory layout and remove old files
More tests