Sort subdirs and fix pep-8