normalized beats/grid, renamed files, did more things than I should for single commit