Move/Rename the classes to a proper logic structure.
Reflect the changes to the starting bootstrap code.