Several folder structure updates, and Static classes added