Migrated to Q and separated modules (large breaking update)