Move apache into a module and add php installation