CHANGED: Try restructuring again... (Somehow all files ended up in /target)