Clean up and old project - change h files to hpp