squash! Correct structure for repository