Restructuring files to match Bones classes