Added ComponentFinder and renamed Loader => Generator