Updating general setup
Adding more source files