2nd commit of folder reorganization