Enterprise Asset completed
utils converted to a package
states refactored