Moved definitions to own sub-directory
Worked on tests for JobBuilder
Completed tests for JobBuildere