Updating folder structure.
Adding more folders.
Merging class source