Add beans.xml to dist
Refactored Lookup to work as expected to java standards