Minor Fix + Project organisation change