update project sructure + build file to match master developments