Style and folder structure updates.