Finished final design and reorganized folders