Made some small changes + Organized the files