Move 'shared' to 'support' and start to cleanup program options