test restructure + more dev