Restructured & Restarted, copied old files into 'old' folder for reference