more project structure, basic bucket functionality/tests
fix merge conflict