Presets / Better organization

This completes the presets from the old version. Lots of code cleanup
needed...