Moved folders into Software Implementation