Major aassets refactoring