Refactoring & Assets Update