Updated with folder structure, and additional assignments