Cleaned and simplified the whole startup procedure

Change-Id: Ia424d5ae482dd56f5e5b0cf50d758944d3626181
Moved the Options out of the Configuration class.

Change-Id: Ia434d044976a68309db626e78afbaf824f227fe5