removed superfluous directories and files
Finally everything is up on the right level
fix file layout