Fixed issues vaused by moving files