Restructring project to be use with Gulp for builds