Andrew's Fix

Everything moved to root folder and updated.