ClassLoader separation. Incremental commit.

WORK IN PROGRESS