Renamed some files and removed unnecessariy classes