Finished moving everything within the PropWare namespace