Added files to cmake, working on classes