Moved schemas to the proper places