Added mutex. Moved files