Changed folder arrangement and keep working