Changed project structure to be a little more uniform.