Moved file, reorganised usings troughout solution > increased performance AND tested