Directory structure cleanup, fix for #191, corrected i44