New package arrangement for future additions and 1.6.4 .gitignore fixed.