No more dynamic modules loading.
Simplified the whole thing.