Restructuring the project and adding mocha as test framework