Updating folder structure.
Merging class source