More Changes
Refactoring shared folders
More Changes