Refoctring Data init with getPmBean
Refactoring tests.
Cleanup of old and not needed files.
Code Optimized and cleaned up.
Code Optimized and cleaned up.