Modified timeline, updated file structure