restructure and updated fab file