refactor bakery to use proper file structure