Clean up repo, add folder structure