Restructure tree + remove scripts folder