code clean up

Getting rid on unneeded interfaces, replacing singelton with java bean