Moved executor to production dir
Added working executable
Fixed includes
Modified test directory