add self as component, clean up
update paths