Introduced Loaders and did some cleaning.