Reorganised files to tidy up locations
Added NLog