Fixed build issue related to directory move