cleaned up a bit and renamed some files