Started adapting apache to conventions
Fixed broken link in readme