move files to proper position
fix build of appwiz