Fixed nightly build, reorganized imports
Fixed snake case warning