third commit, organized folders