cleanup structure
restructure
update fa-