Added more basic classes. Removed a local Builder file.