fix #51
added manager and doa layer and test
removed not needed code