Reorganised rake file