Removed builder; moved sources; Added exception;