fix support for nested directories; add file path to annotation class; bug fixes; clean up