Organized settings (closed #5)

The settings file will now be slightly more organized.