Revert "Refactoring  - Loadable Interface"

This reverts commit 961ad6a40a118f6458f9e7a545469d3a7f6e0bcd.