Renamed a few things and added setup file