Moved preferences to separate package