Changed file names and removed import function