Move leader maps to bottom for convenience of editing
Add function to switch between scala spec and class files