all modules now camelcased, imports corrected