Code cleanup. Resolve issues with shared folder