Further organizing of files and adding items from previous project