Rearranged files and added improved BOA 7.x