Solved filename clash and dependency loop