Added logging. Changed project directory structure.