Add major changes into almost every part of the project

Add major changes into almost every part of the project #46