Slight re-structure of maven repo