Re-organized data directory and various changes to several sections and more new sections