Fix to remove component directory