A bit of restructuring, added index.ecpp