Built out file structure, fixed namespacing issue.