Cleaned up folder, final version uploaded