Move classes out of locallib into auto-loading class dir