Re-orgenized the directories and updated the configuration script to be more automatable.