Comment the public API and cleanup some code.
Change location of user files.