Fixed some naming, merged scripts directory.