Moved files around and added build file to pull the main project
Fixed tests