Making changes on folder structure.

Before Startup.