[refactor] - separate code
[feature] - assets