Added separated files and began user interaction code