Initial commit, folder structure edit