2nd commit, file organization changes