Merging the codebase

Merging the codebase and remove the old files.