Remove test code from main singleton object
Make Rotor object immutable
Moved rotor definitions to a sub package to clean up the main directory