added apache and reorganised the project