Reworked startup script, renamed classes