bug fix on the search for members and restructuring of rest source dir