Update all new code and restructure project folder