Better organisation and added repository url