Fixed build paths, cleaned up configurations