Adopt assets system

Modified a fews lines to adopt the assets system according to #5