Added the main files and made a few changes