Adding package modularity and demo env