cleanup of directory structure

2 jobs for master in 16 seconds