various bucket fixes
move blocks code to blocks directory