Re-organized data directory and various changes to sevaral sections