Moving the old code into the legacy folder for rewrite
Merge remote-tracking branch 'origin/master'