more stuff working
organized the files