Consolidate code into clan directory to fix pip install. Closes #25