Changed all import statements to :require