Changed a bit folder structure