Changed directory name
Added Builder pattern