Improved startup script to be more configurable.
Renaming old classes.
Some fixes and renamings