Step 1 solution
Get rid of useless subdirectory