Cleaned up some using statements

Also started on ORM's schema generation code.