Made the Source more organized via folders