angular modules reorganisation + query mog added occupation